From: Georges Basile Stavracas Neto Date: Wed, 20 Feb 2019 13:33:42 +0000 (-0300) Subject: st: Replace ClutterSize by graphene_size_t X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~781^2^2~543 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=7a92a9ba21b3057df42a5eca71e5685a8b9ed433;p=gnome-shell.git st: Replace ClutterSize by graphene_size_t https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/421 --- diff --git a/src/st/st-icon.c b/src/st/st-icon.c index 2db0ba20c..71a6b8980 100644 --- a/src/st/st-icon.c +++ b/src/st/st-icon.c @@ -48,19 +48,19 @@ static GParamSpec *props[N_PROPS] = { NULL, }; struct _StIconPrivate { - ClutterActor *icon_texture; - ClutterActor *pending_texture; - guint opacity_handler_id; - - GIcon *gicon; - gint prop_icon_size; /* icon size set as property */ - gint theme_icon_size; /* icon size from theme node */ - gint icon_size; /* icon size we are using */ - GIcon *fallback_gicon; - - CoglPipeline *shadow_pipeline; - StShadow *shadow_spec; - ClutterSize shadow_size; + ClutterActor *icon_texture; + ClutterActor *pending_texture; + guint opacity_handler_id; + + GIcon *gicon; + gint prop_icon_size; /* icon size set as property */ + gint theme_icon_size; /* icon size from theme node */ + gint icon_size; /* icon size we are using */ + GIcon *fallback_gicon; + + CoglPipeline *shadow_pipeline; + StShadow *shadow_spec; + graphene_size_t shadow_size; }; G_DEFINE_TYPE_WITH_PRIVATE (StIcon, st_icon, ST_TYPE_WIDGET) @@ -290,7 +290,7 @@ st_icon_clear_shadow_pipeline (StIcon *icon) StIconPrivate *priv = icon->priv; g_clear_pointer (&priv->shadow_pipeline, cogl_object_unref); - clutter_size_init (&priv->shadow_size, 0, 0); + graphene_size_init (&priv->shadow_size, 0, 0); } static void @@ -317,7 +317,7 @@ st_icon_update_shadow_pipeline (StIcon *icon) priv->icon_texture); if (priv->shadow_pipeline) - clutter_size_init (&priv->shadow_size, width, height); + graphene_size_init (&priv->shadow_size, width, height); } } }